[8.x] n-api: backport changes from master #19265
+1,399
−550
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.